window: Always disconnect signal handlers

We connect to the titlebar widgets change notification regardless
whether it is internally created or not, so don't make the signal
handler disconnection conditional on that either.

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 2ff433def20477b315ccaa21c62a537371b392dc..d86f74fc111ad94370bda5a7d3a90aea15368e68 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4028,13 +4028,11 @@ unset_titlebar (GtkWindow *window)
 {
   GtkWindowPrivate *priv = window->priv;
 
-  if (priv->titlebar != NULL)
-    g_signal_handlers_disconnect_by_func (priv->titlebar,
-                                          on_titlebar_title_notify,
-                                          window);
-
   if (priv->title_box != NULL)
     {
+      g_signal_handlers_disconnect_by_func (priv->title_box,
+                                            on_titlebar_title_notify,
+                                            window);
       gtk_widget_unparent (priv->title_box);
       priv->title_box = NULL;
       priv->titlebar = NULL;